[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 00746e3998 -s ours am skip reason: subject contains skip directive Change-Id: Ic0831885aec94c173e7623cf02e45f62a8e75e9b